Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Fri, 4 Nov 2011 17:28:05 +0000 (10:28 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Fri, 4 Nov 2011 17:28:05 +0000 (10:28 -0700)
commitfe1e053a84cb406062cade03d4e67417b36a5ec2
tree74de2b6ef1d77412475c1ab0339c578a20ab2acf
parent057a1722adf98c2ce784bac683abf2fba9db9c2e
parentd1c43213d7ba01592f62dd6e28ffd1b4c84ab106
Merge from trunk.